5e5751b235fb3b148df44c7b09e4372082c263a6,plugins/vcs/source_gen/jetbrains/mps/vcs/MPSVcsManager.java,MPSVcsManager,checkIfProjectIsConflicting,#,127

Before Change


    myChangeListManager.removeChangeListListener(myChangeListUpdateListener);
  }
  private void checkIfProjectIsConflicting() {
    FileStatus currentStatus = FileStatusManager.getInstance(myProject).getStatus(myProject.getProjectFile());
    if (currentStatus != myLastProjectStatus) {
      if (currentStatus == FileStatus.MERGED_WITH_CONFLICTS || currentStatus == FileStatus.MERGED_WITH_BOTH_CONFLICTS) {
        int answer = Messages.showYesNoDialog(myProject, "You have your project file unmerged. It is strongly recommended to merge it before continuing. " + "\nDo you want to merge it now?", "Unmerged Project File", Messages.getWarningIcon());

After Change


    myChangeListManager.removeChangeListListener(myChangeListUpdateListener);
  }
  private void checkIfProjectIsConflicting() {
    VirtualFile projectFile = myProject.getProjectFile();
    if (projectFile == null) {
      return;
    }
    FileStatus currentStatus = FileStatusManager.getInstance(myProject).getStatus(projectFile);